Fix segfault when calling frame_ancestor_p (Bug#26493)

* src/xterm.c (handle_one_xevent): Check that hf was not reset
before calling frame_ancestor_p (Bug#26493).

diff --git a/src/xterm.c b/src/xterm.c
index 8dc1067a688337e9618268bac4da298c438430e9..516929217086c13005437a9b3b2a15bebae1495c 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -8801,7 +8801,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
                   frame.  */
                struct frame *hf = dpyinfo->x_highlight_frame;
 
-               if (FRAME_PARENT_FRAME (f) || frame_ancestor_p (f, hf))
+               if (FRAME_PARENT_FRAME (f) || (hf && frame_ancestor_p (f, hf)))
                  {
                    block_input ();
                    XSetInputFocus (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f),